[backfire] merge r24238 & r26785
authorJo-Philipp Wich <[email protected]>
Fri, 29 Apr 2011 15:15:36 +0000 (15:15 +0000)
committerJo-Philipp Wich <[email protected]>
Fri, 29 Apr 2011 15:15:36 +0000 (15:15 +0000)
commit343e45b590db39093aa6b04f5b2d0dda1ac68297
tree15c13210932b0f2e0c05eb14367b441a6069e8af
parent37f11b601017d91f410c1ecf651e8d2e6d2c7d3d
[backfire] merge r24238 & r26785

SVN-Revision: 26786
.gitignore